Refactoring; Deleted unused code