more @include cleanup