Few TODOs; removal of setFieldFoo() methods.