Removed all source code duplicates