Merge "Removed duplicade library" into main