refactoring

simplefying
dropping unused code