Configuration bits set, some unecessary "TODOs" were removed