Cleanup of all main classes finished