Cleanup

Removed unneeded console logging. Preparing for work on building
support for shutting down components.