Work on v1.4 so far.
Clean up replace code a bit more
Enforce system column disallowed