- doc hacks no longer needed