Remove type parsing for now