Removing default values from the client

After chats with Brock have now got a better understanding about the various flows