Remove the @Resource annotations fro the value set services until we
have factories for them.