remove an unused variable and rename an internal function to avoid namespace conflict with flint
Merge remote branch 'origin/master'