Reduce package size - hopefully without breaking it