Remove default values here and in other params