cleanup commit #2