[BUG #7877] Removed deprecated code