Some more cleaup