Removed:
- Removed the change from this commit: 505f9e015ddd  I removed the code
rather than reverting due to how small the change was.

Altered:
- The default visibility for AMDetector is now false.
- Some small tweaks to some code in AMScanViewUtilites that I found.
Just simplifying code - not any real changes.

Part of #860.