move deprecated first conditions to a where scope