Another good rust remover is water and molasses.
Mix about 1 cup of molasses to each gallon of water and fill the tank or place the parts in it.
It takes several days to do its work but the metal will be clean and unlike Naval Jelly, it won't attack and dissolve the metal.
The unsulfered type of molasses doesn't seem to work very well but if you can find the kind with the sulfur still in it, your in business.
The kind with sulfur in it is often fed to horses so if you have a Co-Op in your area they will know exactly what you want.
Another nice thing about using molasses is it doesn't require any neutrilizing and it washes off easily with water. (Don't forget to apply some oil to protect the metal while your waiting to refill the tank.)