JMX Cleanup; also resolved findbugs issue