refactoring
removed not used elements