Removing nbthole for now.  Was non-functional.

Change-Id: I3b9b37eca48bd2b5d0a61c3312274a56ea274147