cleaning up leftovers from refactor