Remove copy of moved file
FINAL MERGING OF CONFLICTS (hopefully)