#s4t1 Impovement: Remove excess calls