More cleanup of files