Merge pull request #397 from avuton/master

Lots of removals
Suppress warning about num going unused.

Suppress warning about num going unused, it's actually iterated and 
apparently this warning is emitted, regardless.