Merge "Clean up featuresutils library"