Clean up Config.java (not finished)