Removed asserts