clean up
partally solved https://issues.jboss.org/browse/RAILO-2832