Remove some legacies