cleanup, upgraded everywhere to showhide2