Remove CSR reference and minor tweak