Revert "Added Self Test Plugin"

This reverts commit 62c18868b2f01b5a7c2b4a4b5dc4c8ac6bc6d441.
Simplified shutdown