Libs: Minor adjustments, removed unused deprecated functions
Merge pull request #564 from z16/4.1

Libs: Minor adjustments, removed unused deprecated functions