Reduce needless containers