Cleanup
Resolve #256
Remove unused header
Merge branch 'master' into dev