removed unnecessary get parameters