code review changes, remove asserts