Remove CSR for now

Change-Id: I707e317654e8ac36f3b5b6484b05b718206267a3