Removed some code that was commented out