cleanup
add jmx support