CORE-5521: Editor no longer presents false positive
CORE-5521: Class cleanup and notes