a bit of cleanup in SAPUtils