Remove CM-specific stuff
Merge pull request #6 from Ultrax5/pa

Remove CM-specific stuff