code clean up before release