Remove ": Unit =" boilerplate