Components clean up

- Cleaned up components code base.