removing outdated plans

Sorry to make this two separate pull requests, but you'll need both.