Some more tweaks to cleanup extension when disabling