Merge "Cleaning up some enabled features" into main