Remove default host
Remove extra arguement
Remove broken code