readjust indentation

various performance improvements
remove stub labs

No longer needed.