Removed unused imports.
Removed unused Observer-pattern.
Removed unused import.
Removed unused imports.