rm refacto done