Removing account usage from templates