Cleaned up
Merge branch 'stripped' of https://github.com/kolov/civi-stripped into stripped