Fix CS
Remove duplicate code