Removed some more asserts