cleaning up additional unused things, refactoring