JAL-3187 deletions (of Castor code) after merge from develop