Controller cleanup 1