Some cleanup on new files