Shift bloat into dependency