Updating the aliases and removing some unused functions