Removed unecessary imports, removed unused argument