layout: Remove the quirks as now we have the policy hooks in place