Removed cover system, cleaned up units