Many changes, clean many things