First pass at removing legacy code and features
56 files changed