Fix use of deprecated MBeanModule
Cleanup of sample server