cleanup commit #1