Prior to whit doing things.
Removed  components, cleaned up code.