Clean up
Add to System Info: JVM + OS