Remove printout
More changes