Cleanup

More cleanup and fix last external TS file includes.