Preliminary Cleanup - Major Pruning & Code Analysis