Cleaning up files/extraneous files/fixing relations