remove println from few places