Removed unnecessary parameters