Revert "CSM Rapier"

This reverts commit 01e155dea7c88e3c72e83d78af7f998cbe664a86.