Tdh merged 2

agreed... they weren't being used anymore post merge anyways