Removed old files from faulty merge.