Update for 3.8 - we only support 3.8 now
Cleanup destroy / disable