Removing rubish
Cli infrastructure