Combine removable_mount_points & mount_points methods into one