Cleaner execution, support for CLI interface