remove all backwards compatibility; clean up tests