Removed unused resources.
Fix imports etc.