Dropped not refactored code