MOB-2462 conditions removed, fixes