Record layer type
Handle walking the layer builder's preferred layer type stack up to the start pointer
Removing unneeded code and verified TODOs