Removing unnecessary params