more assertion cleanup