Fix removing blocks