#6733 Further cleanup of changes