Cleanup notes, test lines