Removes the last bit of logic from the comp, moves it to shared, and fixes a bunch of deprecation warnings in the system.
0x6273