Remove future enhancements: JMX and AOP