Refactored (removed) code