Merge "Remove unnecessary constructor"