GENERAL CLEANUP COMMIT #1