(MESS) super80 : cleanup, part 2