removing some code that was commented out