Remove unused types for now.
Continue with pointcuts.