Remove deprecated methods, commented out code, and chuff code. Clean up some spacing