[TASK] RTE: Code cleanup