makes guavahelpers to non static, entityfactory from singleton to autowired in spring, removes unused classes