diff --git a/server/routes.py b/server/routes.py
index e365053..820dfc6 100644
--- a/server/routes.py
+++ b/server/routes.py
@@ -108,6 +108,12 @@ def deleteAccount():
     # TODO fix google delete account
     google.deleteAccount(current_user)
     
+    for cal in current_user.calendars:
+        db.session.delete(cal)
+    for dev in current_user.devices:
+        db.session.delete(dev)
+
+    db.session.delete(current_user.google_token)
     db.session.delete(current_user)
     db.session.commit()
     logout_user()