Removed code that was commented out