removed some args