Merge "Remove dead code + trivial refactoring" into main