NEXUS-5993: Fixed some missed places

P2 code was unfinished, and timeline had unused
import.