cleaning up some unused logic and comments