more trivial cleanup