Assertions copied from @aledsage #969
Remove annotation as per @aledsage review comment
WIP