removing things, refactoring codebase