More structure cleanup