Cleaned up uses-feature mapping