Remove unecessary non-nullable indicator