Clean up edits before moving over to rkarsten