Drop historic commented out code
Replace HTML/PHP mix with PHP