Partial clean-up of stweet controller.