refactoring, deleted unused methods