remove workaround for System namespace as it is fixed directly in WFM