starting clean-up of old show me functionality