Cleaning up extension and related.
Clean up plugin.