Remove non-address source
Remove non-address source