Remove unnecessary fieldhandler adapters