Fixup: cleanup