Refactoring: removing not used code