Fix CS and remove unused "use" statements