Upload changes from wapatoo, cleaning