Pull Request for Issue993: SGM Shutdown Clean Up Items

Cleaned up these minor issues.