CLEANUP: remove old asserts