removed debug code and cleaned up incomplete details from the plugin refactor.