Some cleaup