more clean-up on some old gus stuff