Removed files
Fixes in CLI flags
CLI use local flags