Small initial cleanup