Clean-up of codes