Remove legacy subdir code and update checks (1)
Remove legacy subdir code and update checks (2)