more cleanup of things not needed after refactor