Ben: cleanup unnecessary code