Removed old storage
Simplified Dependency injecion