Clean-up unused code