Cleanup hudson rm's and mkdir's

Change-Id: I27835acd12bbf15423ad107d85fcb49d32db7c3d