cleanup after major refactor