Remove deprecations and do not use ByPropertyIdGrouper in StatementList