CE-1162 Code clean-up