Removed yet another deprecated class...