further cleaning of this branch