Avoid superfluous steps