Deleted/Refactored code