got rid of some useless args