Add cleanup version 2 and version 3.
Merge branch 'master' of https://github.com/elffriend/ABS