cleaning up some of the object code