Removed function duplicates