little refactoring (removed unused or replicated resources)