Remove type hints as they could be problematic