Remove few asserts