Remove promo related deprecated code

Fixes #3563