[-TASK] Remove unused uses