LQE-154: Removed code by composite component