more aggressive late move reduction
remove legacy data model