Clean-up of interface