[TASK] Clean up for TER release