Fix clearing of pojo based controls