A bit of cleanup in sdk lib