Removed some old code that was commented out