some more initial cleanup