Clean up some cruft, show OSGi info if it's available