Cleanup unused functions