Major clean up of commented out code and stuff.