master
move deleted constructors to top of class
Removed support for thinning
Changes from scram build code-format-all