refactoring -removing broken stuff