coninued cleaning up of lists - not done yet