Removed some asserts