Minimal Code Cleanup

Removed unused Icon
Removed unused Import -> Updated import from PreInit to EventHandler