Removed unused kwargs