Clean up Config.java