cleanup, removed todo comments