remove afFieldLabel component, and other same-version fixes