cleanup for consistency with 3.0