cleanup (seems bug:379 fixed)