Clean-up no functional changes