Clean up change and dirty tracking