Removed old, un-needed code