Clean imports
Merge branch 'master' of https://github.com/xaviermichel/simple-edm