Some refactoring.
removed unused includes.
Merge remote-tracking branch 'origin/development' into voxelz