House cleaning for the previous commits. TRAD-27 GR-2