Remove need to define MODEL_REPLICATOR or MODEL_REPLICATOR2.  That information is implied by which board directory gets used and should just be part of Configuration.hh or a smaller Model.hh file included by Configuration.hh