Removing a bunch of commented out old code