Remove remaining use of USE_BAND_PARTITIONS

Also, some functions that needed to be static