[TASK] Reneme plugin and code cleanup