Clean up. Code moved to factories.