Moved removing defaults that are also keys to the compile step. This removes quite a few repetitive loops.