Cleanup of kwargs passthrough