--- a/pkg/controllers/user.go	Fri Dec 21 12:19:29 2018 +0100
+++ b/pkg/controllers/user.go	Fri Dec 21 13:04:46 2018 +0100
@@ -17,7 +17,6 @@
 
 import (
 	"bytes"
-	"context"
 	"database/sql"
 	"fmt"
 	"log"
@@ -72,10 +71,6 @@
   ST_XMax(map_extent), ST_YMax(map_extent)
 FROM users.list_users
 WHERE username = $1`
-
-	scheduledIDsSQL = `
-SELECT id from waterway.import_configuration
-WHERE username = $1`
 )
 
 var (
@@ -101,30 +96,6 @@
 (inkluding import errors) and details on the concerned import.`))
 )
 
-func scheduledIDs(
-	ctx context.Context,
-	conn *sql.Conn,
-	user string,
-) (map[int64]struct{}, error) {
-	ids := map[int64]struct{}{}
-	rows, err := conn.QueryContext(ctx, scheduledIDsSQL, user)
-	if err != nil {
-		return nil, nil
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var id int64
-		if err := rows.Scan(&id); err != nil {
-			return nil, err
-		}
-		ids[id] = struct{}{}
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return ids, nil
-}
-
 func deleteUser(
 	_ interface{}, req *http.Request,
 	db *sql.Conn,
@@ -142,8 +113,10 @@
 		return
 	}
 
+	ctx := req.Context()
+
 	// Remove scheduled tasks.
-	ids, err2 := scheduledIDs(req.Context(), db, user)
+	ids, err2 := scheduler.ScheduledUserIDs(ctx, db, user)
 	if err2 == nil {
 		if len(ids) > 0 {
 			go func() { scheduler.UnbindByIDs(ids) }()
@@ -154,7 +127,7 @@
 
 	var res sql.Result
 
-	if res, err = db.ExecContext(req.Context(), deleteUserSQL, user); err != nil {
+	if res, err = db.ExecContext(ctx, deleteUserSQL, user); err != nil {
 		return
 	}