Removal of verify & expire