Remove unsused code (minor)

James Bergstra added the assert in 2010; 
it was not triggered since then so maybe 
this code can finally be removed?
Fix missing variable renames
Merge pull request #1557 from jbornschein/patch-1

Remove unsused code (minor)