Made additional cleanups/simplifications to unblock code.
Made additional cleanups/simplifications to unblock code.

Hansoft/meteor,Hansoft/meteor,Hansoft/meteor,Hansoft/meteor,Hansoft/meteor,Hansoft/meteor,Hansoft/meteor