Some cleanup in preparation for client implementations