Cleanup codes in App Class