clean up warp operation

See https://jira.codehaus.org/browse/GEOT-4409