Missed some points from previous clean-up task