FIXUP: Remove debug strings