Add updates to remove unsupported chunks with best effort preprocessing