Stripping out more functionality that really just belongs in a plugin.