Improvements removing shared rules