removed some useless parameters