clean up warp operation
Merge pull request #145 from simboss/warp-9.x

 clean up warp operation