For upstream

more cleanup :)