Adding logic to remove block