More initial cleanup