Removed stuff that doesn't belong in the framework.