removed beanfactoryaware and cleaned up dao