XXX remove block (this and everything preceding should be folded together)