Using system-properties in standalone.xml, clean-up.