more cleanups part2