Merging with Andrew
Merge branch 'master' of https://github.com/nextsw/preproc
idle variables removed