Feature #759 cleanup