Protect variables, removed unused setup constructors, ready for unorderedIncorporator