Remove dead code and remove unused 'resolve' dependency