Clean up dirty tracking methods