What I do when I'm in your case is add "DELETE" to the variables' names that I want to remove. Then I simply search for the "DELETE" word and remove any reference to the variables.
This way, when I do remove them, I am sure they are not going to mess up my project.