RMLNQ-45 Code cleanup.