Adding some known constants, cleaning Control-List of not applicable nodes