More removal of parameters