Some clean up. Get rid of commented out code and unused methods.