Removed deprecated code bits.