Some clean up.
Getting ready to add discovery and automatic configuration