Remove old field
Misc work
Cleanup