Re-enabled orphanRemoval to go with the changes to the csprocessor.