cleanup scripts

Change-Id: I069533a0c479705bfdaf3288986e36b0fab03247