Removed unused ResourceService
Small fixes