Remove Optional Things From CSR #124