Trivial cleanup