Removed some unecessary type declarations