Deleted objects and refactored code