Restore checking type on remove