Some trivial cleanup