The arguments should probably be removed here also.