More simplification of files