Merge pull request #1046 from cascheberg/fix-resources

Fix hardcoded strings and remove some unused resources
about activity cleanup followup