REFACTOR: Removed unnecessary code