Remove dead code
Remove dynamic field declarations
Merge pull request #20 from JeroenDeDauw/clean

Minor cleanup