Re #880 - codecleaning