further cleanup
WIP refactorig of layer loading
Further cleanup