Removed unused resources
Fixed lint issues