Remove unneeded boxing