CLEANUP: Application.java cleanup