Some clean up before starting real things