Continued tidying for ClearOS 7 [tracker #1985]