Cleanup
Cleanup unused fields