Some more cleaning by KB