Merged functionality of all statusX.php files

- Additional code cleanup