TypeScript cleanup