Add console_clean option
Remove usage of hostname switches