Fix component removal
Add enabled flag