Fix GradleModelBuilder remove methods