Clean up for landing
Shader integration a l'arrache