cleaning for 24.4