Removing duplicate functions