Merge "Clean up unused resources" into klp-dev