remove assertions and add note comments