Jmx code cleanup