Geetha | Refactoring - removing unused code