Major index.php clean-up