Deleted code duplicates