SPRNET-1564 Remove code marked as obsolete