Delete duplicate code + strict verification