Defeaturefy both when building and serving