Ghost default clients and code clean up