Removed unused argument, and fixed other warning.