[TASK] Cleanup CSH calls