Cleaning up, file management optimized.