Fixed function duplicates

Don't understand git yet, my last commit caused the file to have both the new and old versions in the file.