removed files that should not have been added by last merge