Cleaned up plugins to resolve #41