Cleanup before starting

Cleanup before starting