fixed the cleanup process
Merge branch 'master' of https://github.com/vhung92/ADK