remove conditional around Assert
improve asserts