removed useless arguments