Remove unnecessary paramaters