Misc updates cleanup logbook controller code