remove set-field and functionalize objects