[cleanup] Removed deprecated code