remove some values that were being passed in