started a cleanup of the list generation clusterfuck