Controller cleanup