Further cleanup of index.php