Removed anything else that was deprecated in 1.7. At least as far I can tell.