cleanup comments
treat newly added NVGoggles properly