cleaned up refactoring garbage