cleanup; replace haste with typescript