Remove deprecated code :fireworks: :fireworks: :fireworks: