Fixed history clean up