Removed not needed parameter
Fixing memory issues