Move baking static to correct place