Clean up and refactoring
Refactoring and clean up
Removed unused resources