Remove the unnecessary verify calls