Clean-up unused functions