Merge "Removing unused/unmaintained files" into main