When moving away a file which shadows Commons, you must ensure that there is no redirect which continues shadowing Commons. After updating links, remember to request deletion of the redirect. Also, if you decide to move the file to Commons, there is no need to move it locally. Just tell the tool you use for moving it to Commons to choose a different file name, and an admin should soon delete the file.