More proximity fixes
Remove inline comments
Merge pull request #5993 from GinjaNinja32/proximity2

More proximity fixes