removed unnecessary types