Cleaned up a little. No need for dirty flag.