Removed some unnecessary parameters