Delete unused nodes (need to verify)
Merge remote-tracking branch 'origin/develop' into develop-make3d