diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html
index 4146d50d03..d94d569c96 100644
--- a/phpBB/adm/style/acp_storage.html
+++ b/phpBB/adm/style/acp_storage.html
@@ -1,4 +1,3 @@
-{% import 'forms.html' as forms %}
 <!-- INCLUDE overall_header.html -->
 
 <a id="maincontent"></a>
@@ -30,13 +29,35 @@
 			<fieldset id="{{ storage.get_name }}_{{ provider.get_name }}_settings">
 				<legend>{{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }}</legend>
 				{% for name, options in provider.get_options %}
-					{% set l_name = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper %}
-					{% set options = options|merge({'name': storage.get_name ~ '[' ~ name ~ ']'}) %}
-					{% set options = options|merge({'value': attribute(CONFIG, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name)}) %}
-					{{ forms.form_row(
-						forms.form_label(l_name),
-						forms.form_control(options)
-					) }}
+					<dl>
+						<dt>
+							<label for="">{{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper) }}{{ lang('COLON') }}</label>{% if description is not empty %}<br /><span>{{ lang(description) }}</span>{% endif %}
+						</dt>
+						<dd>
+							{% set input_type = options['type'] %}
+							{% set input_name = storage.get_name ~ '[' ~ name ~ ']' %}
+							{% set input_value = attribute(CONFIG, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %}
+
+							{% if
+								input_type == 'text' or
+								input_type == 'password' or
+								input_type == 'email' %}
+								<input id="" type="{{ input_type }}" name="{{ input_name }}" value="{{ input_value }}" maxlength="{{ options['maxlength'] ?: 255 }}" />
+							{% elseif input_type == 'textarea' %}
+								<textarea id="" name="{{ input_name }}">{{ input_value }}</textarea>
+							{% elseif input_type == 'radio' %}
+								{% for option_name, option_value in options['options'] %}
+									<label><input type="radio" name="{{ input_name }}" value="{{ option_value }}" class="radio" id=""{{ (option_value == input_value) ? ' checked="checked"' }}>{{ lang(option_name) }}</textarea></label>
+								{% endfor %}
+							{% elseif input_type == 'select' %}
+								<select name="{{ input_name }}">
+									{% for option_name, option_value in options['options'] %}
+										<option value="{{ option_value }}"{{ (option_value == input_value) ? ' selected' }}>{{ lang(option_name) }}</option>
+									{% endfor %}
+								</select>
+							{% endif %}
+						</dd>
+					</dl>
 				{% endfor %}
 			</fieldset>
 		{% endfor %}
diff --git a/phpBB/adm/style/forms.html b/phpBB/adm/style/forms.html
deleted file mode 100644
index d3e10f563b..0000000000
--- a/phpBB/adm/style/forms.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% macro input(name, value, type, size) %}
-    <input type="{{ type|default('text') }}" name="{{ name }}" value="{{ value|e }}" size="{{ size|default(20) }}" />
-{% endmacro %}
-
-{% macro textarea(name, value, rows, cols) %}
-    <textarea name="{{ name }}" rows="{{ rows|default(10) }}" cols="{{ cols|default(40) }}">{{ value|e }}</textarea>
-{% endmacro %}
-
-{% macro form_control(params) %}
-	{% if params['type'] == 'text' %}
-		{{ _self.input(params['name'], params['value'], params['type']) }}
-	{% endif %}
-{% endmacro %}
-
-{% macro form_label(name, description = '') %}
-	<label for="">{{ lang(name) }}</label>{% if description is not empty %}<br /><span>{{ lang(description) }}</span>{% endif %}
-{% endmacro %}
-
-{% macro form_row(left_content, right_content) %}
-<dl>
-	<dt>
-		{{ left_content }}
-	</dt>
-	<dd>
-		{{ right_content}}
-	</dd>
-</dl>
-{% endmacro %}
diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php
index aa7f45d981..a552be0f44 100644
--- a/phpBB/includes/acp/acp_storage.php
+++ b/phpBB/includes/acp/acp_storage.php
@@ -11,10 +11,6 @@
 *
 */
 
-/**
-* @todo add cron intervals to server settings? (database_gc, queue_interval, session_gc, search_gc, cache_gc, warnings_gc)
-*/
-
 /**
 * @ignore
 */