[TASK] Also drop the static instance