fixed a typo and removed code that is no longer needed
Merge remote-tracking branch 'origin/dev' into rendering_prototype