Libs: Minor adjustments, removed unused deprecated functions