Replace the deprecated <> with two <'s
Delete debug asserts