Some clean-up on the framework.