Cleanup. Only return dicts.