More cleanup.
tweaked to ignore Texapp