Removed old files, removed un-needed code #658