Code optimization
Rome module cleanup