more cleaning for 4.3