clean up warp operation

https://jira.codehaus.org/browse/GEOT-4409 for master