cleanup
Removing components working