cleaning the whole thing before merging in master