Cleanup for Application.java