Controller cleanup ongoing