tenderloin:  clean up flags

Change-Id: I4182bf548f1546aa223c4b995c550c890b18f9b0