More accessibility cleanup