cleanup in nobug.h, remove some cruft