BA Controller cleanup