Cleaned up merge a bit.
Got all cleaning tests passing.