cleanup to close the aurguments

Change-Id: I2d09f6233bfc18ee1e11004afac059f91ec08da6