Move RewriteHistory to ReferenceCollection
Clean up usings