Removing unnecessary verification