More work with Goal adapters and delete functions