Clean up unnecessary object allocation