I deleted obsolete code and commented out a few things.