Remove resolve function