cleanup, as pointed out by @jhulten