Fix CS and unused statement