remove unused resources
commit conflicts