Revert "Added z-raise before retract"

This reverts commit 1c04a67c28778a189314a90912daee5fb7ddccb9.