More clean up and start new files.