WIP: cleaning up scan link