cleanup: get rid of unwanted tap/ toplevel which crept in.