Remove for object members, some cleanups for values