Source-X
Source-X copied to clipboard
Feature/snooping use range
Implement #1142
and minor code clean up of unused vars