Core/Cleanup: Remove more TBC related Stuff