More cleaning up of files