Eliminate extra repositories & constructors w/o parameters