beans.xml cleanup in core