Revert "Cleanup"

Conflicts:
	header.php