Less file change and cleanup