cleanup of unused. No need for backwards compat here