[ṔLINK-130] - Code cleanup.