removed code that was commented out