Remove deprecated config

Fixes #1435