removed (now) useless TODO and cleaned up imports