CYH and BBS cleaned up for AutoGroup