Remove unexpected change
Cleanup plugin initialize
Remove timing code