Updates

* removed deprecated code
* update comments