[TASK] Cleanup variants and behaviour entries