Remove old deprecation code