Metapackage and lint cleanup