Remove fields from constructor