remove non-backwards compatible code