Clean up unnecessary type declarations