Clean up some stuff and make it uberwar compatible