Clean everything up
FIXUP