Clean up struct clutter.