compiler - cpp11 - some TODOs removed