more cleaning for 1st release