Deleted extraneous files, prefixed now-unused files as "old_"