remove unnecessary code (aka refactoring)