Upgrade to CM 1.3.21
Remove unnecessary configs
Remove unnecessary configs
Remove unnecessary configs
Merge pull request #133 from njam/issue-133

Adjust config