remove stuff from main class that is no longer needed.