refactoring
deleted dead code