removed some unused parameters