Properly remove deprecated stuff
3 files changed