Remove deprecated features

The commits describe what is covered