Remove long phrases
Merge pull request #457 from calblueprint/revert-long-phrases

Remove long phrases