Merge "Cleanup: removal flags" into main