refactoring

removed crap