yet more code cleaning.