Warp 9.x clean-up

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