Merge "Delete unused code conditional on MANAGE_MISC_DIRS" into main