cleanup, term bug