Clean up pillar loading behavior