Add non-stupid-assets; cleanup feature_helper