Removed unnecessary default types