Removing debug bumpf, commented out code, etc.