Removing redundant CSC and RPC stuff