Cleanup conquest support (eek!)
Cleanup conquest support (eek!), some of this is not correct