cleaning and PTL fix