Refactor: Deleting code!