Clean up unused functions