Clean up bloat, narrow bp optimisations