remove type table
refactor