remove final _ in some subdirs