updated lists and removed some unused code