Some cleaups