Remove some extraneous code, use *IncludingCustom methods