Removed some parameters that weren't being used