Remove dependency on apiserver/params