final updates for janitor