removing some asserts