further cleanup, removing unused methods