removing typeofs