remove legacy references
3 files changed