Remove optional parameters because Mono hates them