-Changes to remove id dependency. Shutdown cleanup.