Remove upstream boilerplate