Code Review comments and fixes: consider removal of beanfactory, metadata, and typo fixes
Bump Spring Versions