Merge "clean up screen and tail_log references"