adding include array
removed the if_ trait, as we can use the standard std:::conditional instead
removed unused code