Dynamic album code cleanup