[OnDemand] cleanup and fix imports.