Handle removal of wildcard values in deprecation system
Removed some useless code

--HG--
extra : rebase_source : 2010e4f5a480526576ec5982594f5ba606848c22