diff --git a/css/zerobin.css b/css/zerobin.css
index ce4d781f..ec1b9515 100644
--- a/css/zerobin.css
+++ b/css/zerobin.css
@@ -119,7 +119,7 @@ h3 {
 
 #copyhint { color: #666; font-size: 0.85em; }
 
-button, .button, #expiration, #language {
+button, .button, #expiration {
 	color: #fff;
 	background-color: #323b47;
 	background-repeat: no-repeat;
@@ -178,7 +178,7 @@ button img {
 	top: 2px;
 }
 
-#expiration, #language, #burnafterreadingoption, #opendisc { 
+#expiration, #burnafterreadingoption, #opendisc { 
 	background-color: #414d5a; 
 	padding: 6px 8px;
 	margin: 0 5px 0 0;
@@ -186,14 +186,14 @@ button img {
 	bottom: 1px; /* WTF ? Why is this shifted by 1 pixel ? */
 }
 
-#expiration select, #language select {
+#expiration select {
 	color: #eee;
 	background: transparent;
 	border: none;
 }
 
 
-#expiration select option, #language select option {
+#expiration select option {
 	color:#eee;
 	background: #414d5a;
 }
diff --git a/js/zerobin.js b/js/zerobin.js
index a55fd1ec..f8588421 100644
--- a/js/zerobin.js
+++ b/js/zerobin.js
@@ -383,8 +383,6 @@ function stateNewPaste() {
     $('button#clonebutton').addClass('hidden');
     $('div#expiration').removeClass('hidden');
     $('div#remainingtime').addClass('hidden');
-    $('div#language').addClass('hidden'); // $('#language').removeClass('hidden');
-    $('input#password').addClass('hidden'); //$('#password').removeClass('hidden');
     $('div#burnafterreadingoption').removeClass('hidden');
     $('div#opendisc').removeClass('hidden');
     $('button#newbutton').removeClass('hidden');
@@ -412,8 +410,6 @@ function stateExistingPaste() {
     }
 
     $('div#expiration').addClass('hidden');
-    $('div#language').addClass('hidden');
-    $('input#password').addClass('hidden');
     $('div#burnafterreadingoption').addClass('hidden');
     $('div#opendisc').addClass('hidden');
     $('button#newbutton').removeClass('hidden');
diff --git a/tpl/page.html b/tpl/page.html
index bfb5eb37..2cecb2a9 100644
--- a/tpl/page.html
+++ b/tpl/page.html
@@ -56,14 +56,6 @@
 						</select>
 					</div>
 					<div id="remainingtime" class="hidden"></div>
-					<div id="language" class="hidden">
-						<select name="language">
-							<option value="language" selected="selected">Language</option>
-							<option value="C/C++">C/C++</option>
-							<option value="php">php</option>
-							<option value="python">Python</option>
-						</select>
-					</div>
 					<div id="burnafterreadingoption" class="button" style="display:none;">
 						<input type="checkbox" id="burnafterreading" name="burnafterreading" {if="$BURNAFTERREADINGSELECTED"} checked="checked"{/if} />
 						<label for="burnafterreading">Burn after reading</label>