Fix CS doc and remove useless imports