-UserToken.delete_all("expiry < NOW()")
-OauthNonce.delete_all("timestamp < EXTRACT(EPOCH FROM NOW() - INTERVAL '1 day')")
+UserToken.where("expiry < NOW()").delete_all
+OauthNonce.where("timestamp < EXTRACT(EPOCH FROM NOW() - INTERVAL '1 day')").delete_all
+OauthToken.where("invalidated_at < NOW() - INTERVAL '28 days'").delete_all
+RequestToken.where("authorized_at IS NULL AND created_at < NOW() - INTERVAL '28 days'").delete_all