Skip to content

Cleanup primitive

Cleanup primitive #670