fixup! More cleaning