Clean up some mess, attempt to use a .dpm for tank model