Code bloat removal