remove some 1.6 functionality that is not needed anymore
Strip a lot of stuff out that we don’t need!