more cleanup before submitting to webstore
more cleanup before submitting to webstore