Removing redundant/unused files

Some files have been deleted or had their names changed, this deletion
reflects that.