Improved Move solver to handle rename as well
Removed one warning by removing unused line