CXX-322 Remove dropDups support

I'm not super enthusiastic about it, really. I think the layout you have is fine. Trying to make things "better" with the preprocessor is just not worth it really.