more typescript cleanups