just cleaning up some unused bits