Add missing pattern.
Delete not used types and imports.