Removed some arguments.
Simplified delegates.
Removed unused imports.