Removed Unused types and imports