Parser.php cleanup