Remove some unused variables
Tweak readme