+ Commentary, removed deprecated code