fix double delete after latest refactoring

Change-Id: Ie9cae6ee3769631f9095a5995d5165d5367aa2b0
fix missing pieces

That resulted in the wrong color used for some rendering.

Change-Id: I1f427fb65e287d17ca96ea6adbc46686f48f8c6f