fixed up localVars func and includes
removed cecil tests
started cleanup phase 2