Merge "Constructor cleanup"