Remove Factory

GUI testing doesn't like kv classes...