removing unused struct field
Better (hopefully) resouce cleanup
Merge branch 'devel'