Moving unrequired bits from plugin to extension