PIM-3070: Clean directories
PIM-3070: Update CHANGELOG.md