Kill legacy code master

Some point in time we need to remove deprecated code ....

@karlitschek @icewind1991 @bantu