Merge "Remove unnecessary abstraction of classes." into main