[TASK] Cleanup of Template module