Cleaning up optimized update