Cleanup and re-enable est