Cleaning up unused functions