Improved contraction removal