Remove mbeanName field
Remove mbean name option; re-work mbean logic