Components and nodes should be added + removed correctly

Hopefully no crashes?
This remove check is required...
Forgot to remove header
Release 0.0.7