re #280 - Clean-up