[TASK] Cleanup before building panel view