Remove no longer needed params