Remove type-check macro and its uses