Removed duplicate code that was commented out.