Remove types, add get hook