Merge "Clean up scan handling"