deleted unused resources, refactoring