refactoring - removing unneeded code.