removed all the deprecated code slated to be removed for v4.0