Refactoring - Removing old code