Removing old extraneous files before merge