Doing a little cleanup of system.php