removed some transients that lead to NPE