moved static methods, removed unused ctor, removed note files