Also reclaim about 700 lines of code from aforementioned deprecated
features...