Fix #292 #297 deprecated id resolving functions

* Add a new gerneric resolver to resolve ids without cleaning
* Replace deprecated calls
* Remove some unused variables