Switch budget tank to work off an async loader
Clean up unused imports and other housekeeping