Cleaning of code

* Removed non longer used code
* Added constness to some advanced descriptor getters