AppController cleanup