Code clean-up mainly to trigger CI