Clean up package functions. Skip folder-based metadata for now.