Cleanup. Mainly in Application.java.