Removed unnecessary types