Type Load fix, removed deprecated packages, added replacement packages…

…fixed tests, cleaned usings, removed unused references