UPDATED: Removed unused code