Generalized some names.  Removed extraneous spring contexts.