Removed duplicate functions from resolved