! More things we don't need any more.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1354 from Arantor/release-2.1

! More things we don't need any more.