Remove attempts at type shenanigans