remove unnecessary clear

Change-Id: Idf5a07f5b9f298a6a5bf3b7d570e6e2f1b51ea2a
fix unanttended bug

Change-Id: I57b2565c8ad5ec3e3b0f44b48dc3e3aa653b83d0
Merge branch 'master' of github.com:vaconsulting/setup