Remove unnecessary wrapping as ArrayList