updated plan to remove existing functionality