Remove unnecessary factory delegate