reafactoring - unwanted code