removed depricated TO DO's