Housekeeping / Cleanup

All tasks that are caused by other changes should land in this milestone so we don't forget about them

All issues for this milestone are closed. You may close this milestone now.