removed unnecessary factory