I will remove this temporarily until we decide if we need this additional complexity in the code.