Cleanup of read_logs() and imports