Optimization: remove unused blocks