Adding the latest version and removing unused functions