Merge "run-as: remove unecessary code." into main