cleanup and deletions aimed at improving overall app builder speed by re...

...ducing unneccessary db lookups