removed some code that was commented out