Removed TypeResolver and TypeTable