Cleanup
Now message parts can be their own arrays