Remove even more asserts