Compilation warning, and cleanup of sensors collecting