Removed unnecessary deprecations