Remove
Rename resolver
add script