Removed some extraneous arguments