resolve/remove, there are other instances of commented out lines as well